Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sat, 8 May 2010 10:54:36 +0000 (10:54 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sat, 8 May 2010 10:54:36 +0000 (10:54 +0000)

Trivial merge